Fixed EdgeController event handling