try to improve #112