Fixing STRATOS-798