Fixing timers for WSH