Fixed wrong message types being routed.