Bug fix in commerce_marketplace