Remove endless loop