Storage bug fix from alberto