Yea forgot about that, glad I put the TODO I will do it soon for this PR. There are some other TODOs around as well.