Ticket #1120: Bugfix