Fixing STRATOS-762