Fixed compile error from merge.