Fixed bug with Session Storage