fixing STRATOS-984