[Client] Fix possible synchronization problem within the movement