Do you want me to address this or should this be a general TODO?
I just copy-pasted that part from the other, existing, functions.