Potential fix for #14