Hotfix 06/06/12