fixing issue - CARBON-15100
Merge pull request #114 from Nipuni/CARBON-15100

Applying fix for - https://wso2.org/jira/browse/CARBON-15100