Fix for BIG_ENDIAN case