Register all with a proper type
Merge pull request #1152 from tchak/fix-store-all

Register all with a proper type