fixing STRATOS-918