Potential fix for #15