Use correct delivery address when calculating shipping