[4.0] Add underflow preventation code