Removed match check