Operator functions fix