fix a bug in master branch