Fixing broken build after merge