fix issue on release branch