fixing events?