fix #1844