fixing STRATOS-374
fixing STRATOS-374