"Save the merchants ..." still bugs