I think this is a part of your other PR :)