This is an improvement, not a bug fix.