Revert "Updated Possible Fix to #119"

This reverts commit 139dfdf59f09fe997927cb7cc3643f2efa31c501.
Revert "Possible Solution to Issue #119"

This reverts commit 365b7bec7dc5c005da711d20004bf8d8c2d54d08.
Version