Fix Broken Validation