fix bug from last commit