Fixed between room bugs