related to issue #89