fix storage & retrieval