Fix bug in room6.
Merge remote-tracking branch 'origin/robert'