fix #2559