Trying to work around session storage bug