Fix/2.x/issue756