Fix sStorage bug fix from alberto