Ticket #1101: Bugfix