fixing STRATOS-542