Fixed a bug with room tracking