Fix for headers (continued)