Another TODO implicitly solved