using proper partition id if any