fix for #627