Incomplete commit! Rest of bug fix for "final_price".