Fix #1421 Overflow issue