Fix for #112, possibly