Possible fix for issue #112