[Rebecca/Ernesto] - Fixing broken build