Fixed last CGL issue