Fixed for new storage in Select