infinite moves bug-fix