Work on Github issue #139