Fix: currency issue from all methods