Fixed regression namespace issue