fixing STRATOS-685