Fixing recursive validation error.