Fixed JIRA STRATOS-598 (https://issues.apache.org/jira/browse/STRATOS-598)