Fix retrieve