Operator: Fixes #50