Fixing STRATOS-582