Multiple session bug fix