refactor roomcontroller fix #241