Fixed: location when payable/paid