Fix/3.0/issue 946