validation final fix