Potential fix for #19.