Fixing issue STRATOS-577