Fixed workaround for a mass-messaging bug.