Fix #113
Fix #110
Fix #112