Fixed compilation issue after merge.