Merge pull request #153 from elxa/fix-op-command-crashing-core