Updated retrieveByID method to include new fix.