Fix/3.x/issue863