Changed function so that it forces validate