commit storage-fixup