Fix/3.0/refer to issue756