Fix another storage bug