attempt at namespace fix