Fix mistaken early termination of ENT/RMR loop