fix issue caused by last merge