Fix issue #58.