FIX: Fix packaging of forward