Currency Fix MUST BE DONE WITH THIS