Btw, do you want to go ahead and open a PR for this? Or maybe a redmine issue?