Fix message handler - don't duplicate eventType