right, one of the TODOs :)