FIX: Fix for truncated data