Merge pull request #239 from svost/ckey-operator-fix