Bug fix with headers