0167: Fixing not stopping to unload at tip points
#678
#716