fix for #610