Issue #673 first implementation fix, without daily shifting