Fixed #146 by reverting event priority f*ckup