Fix badmatch