Couldn't this PR solve the issue?