Fixed storage usage problem