Should be in another PR (I think actually you need to rebase as I think I made this change earlier)