Fix Room bug