Fix mix up between product and order