Merge pull request from p2pu/issue-781-take-2 Fix issue (a second take)