Minor improvement to session!