normalization adapted to github version