Fix to namespace setting