fix #2480