fixing validation breaks