Need to eagerly convert values during collect, they might change.
Make all tests pass again.
Merge pull request #6 from jimwhite/FIX_ISSUE_5

Fix issue 5