Fixed localStorage Issue