fix for #669