Fix in TIMEOUT_BEFORE_DROP