fix wait keywords