Fix up the fix a little more.