Applying hotfix 2
Applying hotfix 2 again