Ticket #810: Minor bugfix