Should fix #112