Added quirk to make sure the environment is loaded