Added workaround for MPM check