Fix #27 (m mixup)