DEV: Fix computation of forward FX