Fix leash interaction bugs
Fix leash interaction bugs