Another performance patch