Fix to moves-of*