Fixed compile error introduced by previous merge.