Fix for headers problem