Fixed Client Session Context by Plugin