+ bugfix heartbeat