Fix issue #61.