Fixed bug regarding other storage