Bug fix to performance tweak.