Improved Clearing of Event in case of event translation

#27