Apply bugfix #3121 for OCL.