Fix for issue #112