fix #572 #446