Fix for scene numbering issues