20140703 bug fixed