support #4436, #4404