Fixed CGL issue