Better fix for #3443