Fixing matching errors