fixed n/m mixup