FIX: Fix raw