BugFix: Ticket 375467 solved