Ticket #1628: Bugfix