Fixing https://wso2.org/jira/browse/CARBON-15026
Fixing https://wso2.org/jira/browse/CARBON-15026
Merge pull request #48 from johannnallathamby/CARBON-15026

Fixing https://wso2.org/jira/browse/CARBON-15026