fixed namespace problems