fix #2141