Fixing issue #130. closes #130