Fix for SYNAPSE-1014 ----------------------- Porting fix from https://github.com/wso2/wso2-synapse/commit/fbc829ae1e52c552aa348967db929fa21a8cf1f6 by Isuru Ranawaka