Merchant system fix