fix #1612