Fixes #42

Event trigger fired after everything else is finished