Another performance tweak