Restore compatibility with MFR, fixes #86