Even better fix for #3443