Fixed random moves
Merged