I have changed to check that it has not been set