Update to Issue #139