Forgot to setup the next heartbeat
Merge branch 'fix-setup-heartbeat-again'