Fixing STRATOS-653