Fixing data retrieval