fix #2499