fixed one todo, thanks to Florian Mendels' section