Noted and added to list of TODOs (missed this one in my clean up)