Take out mistaken exit and add in value replace