Fixing leapy motions