Fixing issue #112