I'm on my way into the weekened, so I'll quickly switch computer and send a PR for that later and also perhaps I can also get a proposal for the daily fix