Fix for conflict with CompactHeader addon