Fix: namespace handler