Fix for JIRA ticket COGE-112