Fixed ordering issue on Session.