added compatibility for non-recurring events