Fix for #112