fix bug from prev commit