fix #2331