Fix operator instantiation