Temporary fix for losing session variables