Added clipping of 16-bit data