Fixed compile error introduced by merge