Fix to session manager