An attempt to speedup the validation (bug 1108554)