Event handling fixed.