Cristian: fixed the session