fix for #601