patches overly aggressively matches messages