#408 Fix operator ids