Fixed compilation after merge