Fix match escaping