Potential fix for #3.