fixing STRATOS-965