Fixed event handlers
Fixed event handlers