fix for #634