WIP: fix issue #2.