Fix WAITACK timeout computation