Fix overflow error again
Revert some shit of mine