Fix removal of current ns during disambiguation