Maid 278 fix

Handles timeout and timer cancellations as intended.