FIX: Fix decode