fixed singleton retrieval