Address issue #66.