Fixed a compile error introduced during merging