fix issue after merge