Make a separate issue about this then?