Fixes the slowness on validation