bug fixed
improve monitor-client support