fix nemespace issues