Hotfix issue #2328