Your proposition is smart. I'll fix my PR with it