Fixed return in matcher