Fix to Wait command.