fix #2207