FIX: Iteration issue with multiple currency types