Fix PR1842.