fixing STRATOS-494