fixed bug from previous fix