Fix for initialization ordering problem.