Address issue #138.