fix performance regression on CL extensions.