Core/Extractors: Fixed a possible issue with M2 model scaling