Fixing issue #248
Merge pull request #249 from okin/fix248

Fixing issue #248