Fixed borked merchant state checks.