Local storage support fix