Ticket #84 (new task)