Fixed heading bug