Bug fix for header