Fix store concurrent issue with overwrite