Made validation not trigger immediately