solved bug from previous comit