Bug fix for the new header.