I agree, I'm happy to look into this myself once merged.