3.8.2.3 patch

uint8_t patch