Fix issue #41.