implemented issue #112