Fixed the data retriever.