I've updated the PR as per this comment.