Happy to fix the patch, just to check, with the build option? It does sound like a safer bet - even if we default it to true.

Thanks

Sean