It is quite a pain yes, my master node rewards have rolled over and died. lol.
But they are currently busy working on a fix. I think they might change the difficulty retarget to happen more often.