Clean fix for #25.