Fix this match faster!


#1