Fixing MPL bug