Try to fix the underflow bug