Changed behavior of ensure valid state filter