fix #2681