fixing issue 488
fix broke some tests
submitting potential fix for issue 488
Merge pull request #489 from jaredstehler/issue-488

Issue 488