Patching last commit

Maybe also theoretically fixed scene switch?