Fixed raw event handling error