Ticket #1074: Bugfix