Bugfix bug #5174