Fix for #701