Overflow Exception fix

Hoping to fix #897. Thanks Slade-!
---
Fixes #897