Fix bug in random matcher