A better fix for #113