Fix room saving