Integrated Matthieu's patch for universe inconsistencies.