Potential fix for #240