One less TODO :)