fixing the issue STRATOS-521