I've applied the patch provided in the parent issue. Another fix is made in r...