[WIP] Overflow Exception fix in the Clean Window

Hoping to fix #897. Thanks Slade.
See [this repo](https://github.com/topvis/TestApp) for the bug.
--------
Fixes #897