fix events to show proper values