fix #2279