Fixing custom header feature