Fix for Issue #89

Only has fix for Issue #89 in this commit. Reverted my other 2 changes from my fork