Fixing a poorly placed fix.