improve the fix slightly to avoid false positives