Added return in event handler