Fix for OCM-69