More terrible hacking to get heading working