fixing STRATOS-908