Alternative small fix for issue #112