Fixed endless loop on double stop