Bug fix related to the selected currency