Normalization correction

Issues related to these corrections are discussed here #123