Support for room (fix #2)