restore MFR support using @skyboy's version