fix #1674