Check for truncation in more places