unify cases in mpf version too