really fix #1699