Fixed Event queue so that it actually works.