Added hotfix2