Possible fix for #112