fix #2710