fix issues with storing