Fix possible endless loop conditions