Fix issue #84.