Bugfix in not calling the match()