Agree we should look at that, will you open a separate issue @devin-c?