[FIX] Uint16 overflow