GCL1-12004 Another fix