Fixed #164 by applying more normalization.