Fix to use 16-bit array instead of 32-bit