fix #1823