Alternative, more heroic fix for #41