Fixed to prevent missing values zeroing means