Fixed rare race-condition with disconnection timer