fix #110 fix #112