Fixed edge event completely