Attempt to fix Validation