Fixed compability with the new session driver