View difference between Paste ID: KzB4hJua and bPsFv9fs

 	/* From now we'll calculate with fractional cargo amounts.
 	 * First determine how much cargo we really have. */
 	amount *= best_rating + 1;
 
 	uint moving = 0;
-		p.second = amount * company_best[owner] * p.first->goods[type].rating / best_sum / company_sum[owner];
+
 		uint owner = p.first->owner;
-		uint difference = amount * company_best[owner] * p.first->goods[type].rating % (best_sum * company_sum[owner]);
+
-		p.second |= (65535 * difference / best_sum / company_sum[owner]) << 16;
+
 		uint a = amount * company_best[owner] * p.first->goods[type].rating;
 		uint b = best_sum * company_sum[owner];
-	/* If there is some cargo left due to rounding issues distribute it according to the highest decimal. */
+		p.second = a / b;
 		moving += p.second;
 		p.second |= (65535 * (a % b) / b) << 16;
 	}
 
 	/* If there is some cargo left due to rounding issues distribute it according to the highest remainder. */
 	if (amount > moving) {
 		std::sort(used_stations.begin(), used_stations.end(), [](const StationInfo &a, const StationInfo &b) {
 			return b.second >> 16 < a.second >> 16;
 		});
 
 		assert(amount - moving <= used_stations.size());
 		for (uint i = 0; i < amount - moving; i++) {
 			used_stations[i].second++;
 		}
-	}
+
 
 	uint moved = 0;
 	for (auto &p : used_stations) {
 		moved += UpdateStationWaiting(p.first, type, GB(p.second, 0, 16), source_type, source_id);
 	}
 
 	return moved;