Hotfix I made some time ago
Add call to new/old hotfix function
Extract medium normalizing into method