added fix for no local storage