Fix retrieve() interface conformity