issue #112 fixed