fixed wait custom commands