Movement encapsulation (little fix)