Add a TODO to make this nicer?