Working on Github issue #139