Reapply ? fix
Re-apply validate fix