Should this maybe fix #112 ?