bugfix: make storage process atomic