fix a bug in master