Fixing CARBON-15035

[1] https://wso2.org/jira/browse/CARBON-15035