Better handling of truncation.

Handle the values better (truncation).