Now with namespace fix