Fix a problem with the previous fix.