make heartbeat origins consistent