Fix to stop double validation