Workaround new MP issues