Hotfix issue2272