Soft fix for #131.