Bug fix for namesapce