Potential fix for #223