Fix the previous fix, correctly.