Matrix def fix

Scale was set in an unsafe way when using all other options.