Fix issue #2.

Revert changes of commit e7859d.