Work around issue causing project to not be saved correctly