Operator changes for issue #76

contains fix for issue #76