issue #139