Fixed TODO of values free.