fixed handling room variables