JAGGERY-377

https://wso2.org/jira/browse/JAGGERY-377