Bug fix for custom header