fix #2307