update motion (patch from #1868)