artf762006 , artf743310 bug fixing