fixed .dstore
merged