Address issue #86.