fix for #480