Potential fix for #16