fixed namespace handling