Fix for #609