Current solution provides manual workaround, doesn't prevent the error happening if the flag isn't set.
Current solution provides manual workaround, doesn't prevent the error happening if the flag isn't set.