Fix repeated visits through the storage spoke