Fixed compilation error caused by last merge.