Fix PR1692