Calendar trigger at end of an even

I have setup a calendar event for the period that I am on holiday. I have created an automation that triggers at the start of that calendar event which turns off my heating when I am away. I can use the Title or the Description of the event to identify the “holiday”.
However, when I try to create an automation to turn the heating back on at the end of the calendar event, the automation sees the data for my next (future) calendar event (Title, description).
Has anyone else come across this? Is there a work around?

You cant have overlapping events if you want to use the start and end events as triggers.