fix for #476