Fix update issue with validity strategy, refs #38