fix combining bug