Fix for MPL <= 1.1