Fix issue #19.