Hotfix - Set new conditions for "waiting time".