Fix PR1657