Hotfix/6278

Fix for #6278