add return statement to event handler