fixing STRATOS-675