Will look into this in the forthcoming PR.