Fix retrieve headers