fix #1599