Improve solution of bug #19701