Fixed TODO newline problem, maybe?