fix #2385

fix #2422