Potential fix for #621