Currency bug fix