FIX: Fix 3.3 handling
FIX: Reading?