actually fix #112
Merged in latest master.