fix #2551 #2549