bug fixing after namespace changes