[Mercy/Ernesto] - fixing broken build