Fixing #12 (scenes)