Fixed a big bug with heading