Fix issue #2.

Revert changes of commit e7859d.
Merge pull request #3 from xkbeyer/issue#2

Fix issue #2.