fix Events class