Attempt to fix issue https://www.mulesoft.org/jira/browse/CLDCONNECT-1119