fix bugs of storage