Hi, I've been looking at our current code and would like to propose the
attached patch for that issue.