Fix for headers (trial)