Fixed issue with non root ns classes