Fix non-existing ns; Fix before ns