Fixing STRATOS-392