Ticket #1870: Bugfix