Ok. So I suggest we keep things as-is for now but also create a "enhancement" or "task" issue on our side to modify this when SitePen/dstore#6 will be fixed?