Fixed scene change bug