[wip] Extend wait timeout