OCL fix bug #1480