fixing new bug from previous fix