fix client behavior with modified global behavior