Hotfix implemented