Bugfix with Room class.