#66: Session code functionality fixed