Fixed ordering of components.
Are the events we're using broken or something?