fixed failures of last merge