proposed fix for #445