fix bug from last changes