bug fix on find storage