Hotfix for bug #5905

Hotfix for bug #5905