also handle 'tyoe' types
Merge pull request #780 from guardian/storage-fixb

also handle 'tyoe' types