Switch to proper reindexing Storable map