Last minute fix for initial boundary event state