Potential fix for #29.