Fix new code overflow issue