Feature request from #soupwhale