I'll keep an eye open for this low hanging fruit pr ;)