Fix parsing of moves