Fixed redundant event handlers