Final fix
Merge pull request #204 from aRn0D/currency/final_fix

Final fix