* MoE took my patch; modify the downstream accordingly