A more thorough fix for bug#19307