Fix/3.0/issue887