That's nice, one TODO less :)