fix remove room and add alert