Removed buggy operator code