Bug in showing discounted price - checkout

Hi,

when I set the Show Discounted Price on the Product Listing to: Display the price before the discount is applied, there seems to be a problem in the cart displaying the price. This has been confirmed on my installation and on the demo website. Please see the screenshot:

I followed the instructions above but now it's showing two prices in additional to the product price. Please see attached.

This is under price in the language file:
;price
PRICE_BEGINNING=""
PRICE_BEFORE_ORIG=" ("
PRICE_AFTER_ORIG=") "
PRICE_DISCOUNT_START=""
PRICE_DISCOUNT_END=""
PRICE_BEFORE_TAX=" ("
PRICE_AFTER_TAX=" without VAT) "
PRICE_END=""
FREE_PRICE="Free"
PRICE_SEPARATOR="<br/>"
PER_UNIT_AT_LEAST_X_BOUGHT=" per unit for buying at least %s"
PER_UNIT=" per unit"

and this is in the override:
PRICE_BEFORE_DISCOUNT_START=""
PRICE_BEFORE_DISCOUNT_END=""
PER_UNIT=" each"