Potential fix for #18