Fix for OCM-65

This is a fix for https://issues.apache.org/jira/browse/OCM-65