Fixed events in the client