After some crying, I may have fixed the negative number issue #837