Pandamonium/localStorage fix