issue #112 fixes