Finally resolved the incorrect data retrieval