Fixing STRATOS-849