Quick fix to session stuff