correct error from manual code merge