Scene switching fixed