fixed null room error, change room controller