Attempt to fix clip motion.

Clips with scaling factors are still broken. I'll look into this later.