Fixed message routing logic