Fixed broken retrieveAll() method