work in issue #112