Ticket #984: Bugfix