simplify the previous fix