Trying headers for #638