Fix retrieveBy