Fix retrieve form