A potential fix for #48.