address issue #89