Updated switch_scene method in SceneBase
Found the bug, patched it. Might be a more elegant way...