Ticket #1234

These changes are ok.