fix bug from merge master