Fixing issue #107