Fix to fix a fix that needs fixing.