simplify previous fix