another fix of difference between master and v2.1