[Storage] Bug fix