Theoretical heartbeat support
Fix no-timeout case