Bug fix (if name space repeat 2+ times)