bug from previous commit fixed