go with hack-y underflow fix instead