Really fix truncation