Bug fix keep all GB settings on toggle change