Fix issue #136.