Addd else to match check