Fixed.throughout session code.