fixed a couple of misfiring events