fixed wait for move