Really fix #2490, rel: #2629