Another fix for the currency problem for bug #8392.