Fix PR1896