Fixed events not propogating due to new changes :bug: