Fix for #460
Merge pull request #461 from poixen/clickfix

Double click room fix