Fixed the matchs.
Changed output according to latest fix.