BugFix: Ticket #381079 solved