fix #415 - improve % motion