Fixed id retrieval