fix #2354