Fixed more truncation