Implemented normalization fix from hydde plugin