Updated to correctly handle RicciScaling=false.