fix storage duplication