fixing node/add/waiver issue