Element event fix and new build