Fixed not existing currency issue
Merge branch 'master' into 1trillion