MP 1.6 Compatibility

Should work with MP1.7PR