a more thorough fix for #2328