Fix issues in pull #243
Merge pull request #244 from karma-exchange-org/fix_pull_243

Fix issues in pull #243