Fix Local Storage Issue