fix #2594