Patch for name space bug