Match Error Prevention

Adjusted to avoid potential match errors.