actually fix storage duplication