Fix issue in room matching caused by GCC