fix #1837