Switch to using AFMotion