Small Scenes bugfix.
Merge pull request #548 from RotaruDan/fixes

Small Scenes bugfix.