fix issue in v1.15.0