Fix master build error