Fixing headers, or trying =)