FIX: Fix arrows