Sunset - 30 not working

I have setup mode manager to toggle like this: Day - @Sunrise, Evening - @Sunset, Night - @23:00

Than in rule machine i have a rule that when mode changes to Evening will start fading in my lights. It all worked on day 1 but it was a bit to dark when it triggered.

So I changed Evening - @Sunset - 30 mins.

Next day the lights did not come on. Checked the mode and it was still in Day. Manually changed it to evening and the lights came on. Checked the logs and sure enough no event to change the mode. Come 23:00 it changed to night and next morning switched to Day.

Next day same thing. So i changed it back to Evening - @Sunset after it did not fire and sure enough 25 mins later bam mode changed. Next day it fired with no issues.

Reading around it seems there is an issue with mode switching when using the - XX minutes. Is there an alternative until this gets fixed to set something like this up without hardcoded times?

System events showing the issue: