Fix issue #23.