Fix/3.x/issue929