Fixed unwanted trimming of events