Fix match function bugs