Fix realtime bug introduced in 675ec07bdc12291f11d0198ff4eef8279a53d5d6
Fix eric's heading bug