Ensure that the logic works everywhere

[thuiop]

Please post your bug reports here. Include the "current scene" cookie value in your answer if possible.