Generic fix for #3.