support #641