fixed bug from last commit