fixed the TODO, the if block didn't make sense indeed. Also make it clearer which...