#169 one todo removed from report